projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d23f77a c6edccf)
bitkeeper revision 1.964 (40cdcaeb71wqrd3Jo42JYBrV5iTWiA)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 14 Jun 2004 15:57:31 +0000 (15:57 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 14 Jun 2004 15:57:31 +0000 (15:57 +0000)
Merge ssh://xenbk@gandalf.hpl.hp.com//var/bk/xeno-unstable.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

1  2 
BitKeeper/etc/ignore patch | diff1 | diff2 | blob | history
tools/examples/xm_dom_create.py patch | diff1 | diff2 | blob | history

diff --cc BitKeeper/etc/ignore
index 8068d4128126d524afc1e0438e31d3fe455b348f,8db6a94aae34240015a2dd508bf398a683a24482..7f5d7578d3401a75a411cab5f11aa389066f6f5c
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -7,6 -8,6 +8,7 @@@ BitKeeper/*/
  PENDING/*
  TAGS
  extras/mini-os/h/hypervisor-ifs
++install
  install/*
  linux-*-xen/*
  linux-*.tar.gz
@@@ -28,6 -30,4 +31,5 @@@ xen/include/xen/compile.
  xen/tools/elf-reloc
  xen/tools/figlet/figlet
  xen/xen
- xen/xen.*
 +xen/xen-syms
- install
+ xen/xen.*
diff --cc tools/examples/xm_dom_create.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.